X-Git-Url: https://git.r.bdr.sh/rbdr/map/blobdiff_plain/be897af3bd7cc010c1aa496d5b1faf8a2e1f82ed..ed10ac191df473c92c4fec495aafa7f569d108c8:/Map/Presentation/Base%20Components/MapTextEditor.swift

diff --git a/Map/Presentation/Base Components/MapTextEditor.swift b/Map/Presentation/Base Components/MapTextEditor.swift
index 2e4f279..ff98203 100644
--- a/Map/Presentation/Base Components/MapTextEditor.swift	
+++ b/Map/Presentation/Base Components/MapTextEditor.swift	
@@ -89,10 +89,11 @@ class MapTextEditorController: NSViewController {
         textStorage.removeAttribute(
           .backgroundColor, range: NSRange(location: 0, length: textStorage.length))
 
-        for range in highlightRanges {
+        for (index, range) in highlightRanges.enumerated() {
           let nsRange = NSRange(range, in: textStorage.string)
 
-          textStorage.addAttribute(.backgroundColor, value: NSColor.Syntax.match, range: nsRange)
+          let color = index == selectedRange ? NSColor.Syntax.highlightMatch : NSColor.Syntax.match
+          textStorage.addAttribute(.backgroundColor, value: color, range: nsRange)
         }
 
         textView.needsDisplay = true
@@ -108,19 +109,10 @@ class MapTextEditorController: NSViewController {
           let range = highlightRanges[selectedRange]
           let nsRange = NSRange(range, in: textStorage.string)
           textView.scrollRangeToVisible(nsRange)
-          textView.selectedRange = nsRange
         }
       }
     }
   }
-
-  private func setSelectionColor() {
-    guard let textView = self.textView else { return }
-
-    var selectedTextAttributes = textView.selectedTextAttributes
-    selectedTextAttributes[.backgroundColor] = NSColor.yellow.withAlphaComponent(0.3)
-    textView.selectedTextAttributes = selectedTextAttributes
-  }
 }
 
 extension MapTextEditorController: NSTextViewDelegate {
@@ -259,6 +251,8 @@ struct MapTextEditor: NSViewControllerRepresentable {
     context: NSViewControllerRepresentableContext<MapTextEditor>
   ) {
     nsViewController.highlightRanges = highlightRanges
-    nsViewController.selectedRange = selectedRange
+    if nsViewController.selectedRange != selectedRange {
+      nsViewController.selectedRange = selectedRange
+    }
   }
 }